Provide fillDescriptions for Pixel CPE classes #27694

mmusich · 2019-08-05T14:28:39Z

PR description:

This PR provides fillDescriptions methods for PixelCPE classes as requested in issue #27660.
The fillPSetDescription method is used when useful to recycle configuration from the helper classes.
As a result, all occurences of existsAs in RecoLocalTracker/SiPixelRecHits are removed.
The parameter DoCosmics (unused) is removed from the configuration files of PixelCPEClusterRepair and PixelCPETemplateReco though is maintained in the fillDescriptions as it happens to be in existing HLT configuration files.

PR validation:

It passes standard tests performed with addOnTests and

runTheMatrix.py -s -j 8 -t 4 --ibeos

if this PR is a backport please specify the original PR:

This PR is not a backport.
cc:
@tsusa @pmaksim1 @cmantill @OzAmram @tvami

cmsbuild · 2019-08-05T14:29:07Z

The code-checks are being triggered in jenkins.

cmsbuild · 2019-08-05T14:35:43Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27694/11298

This PR adds an extra 48KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File RecoLocalTracker/SiPixelRecHits/interface/PixelCPEGeneric.h modified in PR(s): Correcting Cross-Talk Effect in The Phase-2 Inner Tracker Detector #27593
- File RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc modified in PR(s): Correcting Cross-Talk Effect in The Phase-2 Inner Tracker Detector #27593

cmsbuild · 2019-08-05T14:36:10Z

A new Pull Request was created by @mmusich (Marco Musich) for master.

It involves the following packages:

RecoLocalTracker/SiPixelRecHits

@perrotta, @cmsbuild, @slava77 can you please review it and eventually sign? Thanks.
@makortel, @felicepantaleo, @GiacomoSguazzoni, @rovere, @VinInn, @dkotlins, @gpetruc, @ebrondol, @threus this is something you requested to watch as well.
@davidlange6, @slava77, @fabiocos you are the release manager for this.

cms-bot commands are listed here

RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc

Dr15Jones · 2019-08-05T14:51:23Z

@mmusich thanks for doing the work!

cmsbuild · 2019-08-05T14:56:30Z

The code-checks are being triggered in jenkins.

RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc

cmsbuild · 2019-08-05T15:03:40Z

+code-checks

Logs: https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-27694/11300

This PR adds an extra 48KB to repository
There are other open Pull requests which might conflict with changes you have proposed:
- File RecoLocalTracker/SiPixelRecHits/interface/PixelCPEGeneric.h modified in PR(s): Correcting Cross-Talk Effect in The Phase-2 Inner Tracker Detector #27593
- File RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc modified in PR(s): Correcting Cross-Talk Effect in The Phase-2 Inner Tracker Detector #27593

cmsbuild · 2019-08-05T15:04:09Z

Pull request #27694 was updated. @perrotta, @cmsbuild, @slava77 can you please check and sign again.

Co-Authored-By: Chris Jones <[email protected]>

slava77 · 2019-08-27T21:21:24Z

related to the cfi cleanup

I see that some explicit (re)definitions of the ES producers are present in the following (excluding auto-generated HLT files)

PixelCPEGenericESProducer

cmssw/DPGAnalysis/SiStripTools/test/overlapproblem_pixelphase1_cfg.py

Lines 50 to 72 in 2c0f2ab

    
           process.PixelCPEGenericESProducer = cms.ESProducer("PixelCPEGenericESProducer", 
        
                                                              EdgeClusterErrorX = cms.double(50.0), 
        
                                                              DoCosmics = cms.bool(False), 
        
                                                              LoadTemplatesFromDB = cms.bool(False), 
        
                                                              UseErrorsFromTemplates = cms.bool(False), 
        
                                                              eff_charge_cut_highX = cms.double(1.0), 
        
                                                              TruncatePixelCharge = cms.bool(False), 
        
                                                              size_cutY = cms.double(3.0), 
        
                                                              size_cutX = cms.double(3.0), 
        
                                                              inflate_all_errors_no_trk_angle = cms.bool(False), 
        
                                                              IrradiationBiasCorrection = cms.bool(False), 
        
                                                              TanLorentzAnglePerTesla = cms.double(0.106), 
        
                                                              inflate_errors = cms.bool(False), 
        
                                                              eff_charge_cut_lowX = cms.double(0.0), 
        
                                                              eff_charge_cut_highY = cms.double(1.0), 
        
                                                              ClusterProbComputationFlag = cms.int32(0), 
        
                                                              EdgeClusterErrorY = cms.double(85.0), 
        
                                                              ComponentName = cms.string('PixelCPEGeneric'), 
        
                                                              eff_charge_cut_lowY = cms.double(0.0), 
        
                                                              PixelErrorParametrization = cms.string('NOTcmsim'), 
        
                                                              Alpha2Order = cms.bool(True), 
        
                                                              Upgrade = cms.bool(True) 
        
                                                              )

cmssw/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py

Lines 76 to 97 in 2c0f2ab

    
           hltESPPixelCPEGeneric = cms.ESProducer( "PixelCPEGenericESProducer", 
        
             EdgeClusterErrorX = cms.double( 50.0 ), 
        
             DoCosmics = cms.bool( False ), 
        
             LoadTemplatesFromDB = cms.bool( True ), 
        
             UseErrorsFromTemplates = cms.bool( True ), 
        
             eff_charge_cut_highX = cms.double( 1.0 ), 
        
             TruncatePixelCharge = cms.bool( True ), 
        
             size_cutY = cms.double( 3.0 ), 
        
             size_cutX = cms.double( 3.0 ), 
        
             inflate_all_errors_no_trk_angle = cms.bool( False ), 
        
             IrradiationBiasCorrection = cms.bool( False ), 
        
             TanLorentzAnglePerTesla = cms.double( 0.106 ), 
        
             inflate_errors = cms.bool( False ), 
        
             eff_charge_cut_lowX = cms.double( 0.0 ), 
        
             eff_charge_cut_highY = cms.double( 1.0 ), 
        
             ClusterProbComputationFlag = cms.int32( 0 ), 
        
             EdgeClusterErrorY = cms.double( 85.0 ), 
        
             ComponentName = cms.string( "hltESPPixelCPEGeneric" ), 
        
             eff_charge_cut_lowY = cms.double( 0.0 ), 
        
             PixelErrorParametrization = cms.string( "NOTcmsim" ), 
        
             Alpha2Order = cms.bool( True ) 
        
           )

PixelCPETemplateRecoESProducer

cmssw/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py

Lines 66 to 74 in 2c0f2ab

    
           hltESPPixelCPETemplateReco = cms.ESProducer( "PixelCPETemplateRecoESProducer", 
        
             DoCosmics = cms.bool( False ), 
        
             LoadTemplatesFromDB = cms.bool( True ), 
        
             ComponentName = cms.string( "hltESPPixelCPETemplateReco" ), 
        
             Alpha2Order = cms.bool( True ), 
        
             ClusterProbComputationFlag = cms.int32( 0 ), 
        
             speed = cms.int32( -2 ), 
        
             UseClusterSplitter = cms.bool( False ) 
        
           )

The overlapproblem_pixelphase1_cfg.py is apparently not used.
The SiStrip_OfflineMonitoring_cff defines a hltESPPixelCPEGeneric and hltESPPixelCPETemplateReco and is apparently included in the standard workflows via DQMOffline_cff.
I think that these other definitions should be eventually cleaned up and replaced by definitions from the reference cfis.

slava77 · 2019-08-27T21:23:15Z

+1

for #27694 6bf1f4c

code/configuration changes are in line with the PR description and the follow up review
jenkins tests pass and comparisons with the baseline show no differences

There are still a few places outside of the reference PixelCPE package definitions where the ES producer instance configurations can be cleaned up. This can be done in a follow up PR
#27694 (comment)

Martin-Grunewald · 2019-08-28T12:42:03Z

+1

jfernan2 · 2019-08-28T19:01:11Z

+1

cmsbuild · 2019-08-28T19:03:44Z

This pull request is fully signed and it will be integrated in one of the next master IBs (tests are also fine). This pull request will now be reviewed by the release team before it's merged. @davidlange6, @slava77, @smuzaffar, @fabiocos (and backports should be raised in the release meeting by the corresponding L2)

kpedro88 · 2019-08-28T21:02:03Z

+1

fwyzard · 2019-09-12T14:32:35Z

I just stumbled upon this - it looks like RecoLocalTracker/SiPixelRecHits/python/PixelCPEFast_cfi.py was not updated to reflect these changes.

makortel · 2019-09-12T14:37:46Z

@fwyzard PixelCPEFast exists only in the Patatrack fork.

mmusich · 2019-09-12T14:37:50Z

I just stumbled upon this - it looks like RecoLocalTracker/SiPixelRecHits/python/PixelCPEFast_cfi.py was not updated to reflect these changes.

@fwyzard There is no such file in cmssw...

fwyzard · 2019-09-12T14:38:59Z

Yep, that's what I just realised... thanks.

mmusich added 2 commits August 5, 2019 14:00

introduce fillDescriptions in PixelCPE classes

9338d0a

remove useless parameter

b84d6fe

cmsbuild added this to the CMSSW_11_0_X milestone Aug 5, 2019

cmsbuild added code-checks-pending comparison-pending orp-pending pending-signatures reconstruction-pending tests-pending labels Aug 5, 2019

cmsbuild added code-checks-approved and removed code-checks-pending labels Aug 5, 2019

mmusich mentioned this pull request Aug 5, 2019

fillDescriptions for PixelCPE classes #27660

Closed

Dr15Jones reviewed Aug 5, 2019

View reviewed changes

RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc Outdated Show resolved Hide resolved

Dr15Jones reviewed Aug 5, 2019

View reviewed changes

RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc Outdated Show resolved Hide resolved

avoid using the copy-constructor

9fc23c2

cmsbuild added code-checks-pending and removed code-checks-approved labels Aug 5, 2019

Dr15Jones reviewed Aug 5, 2019

View reviewed changes

RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.cc Outdated Show resolved Hide resolved

cmsbuild added code-checks-approved and removed code-checks-pending labels Aug 5, 2019

mmusich and others added 2 commits August 5, 2019 17:04

Remove value for optinal parameter TanLorentzAnglePerTesla

14b150e

Co-Authored-By: Chris Jones <[email protected]>

Remove value for optional parameter PixelErrorParametrization

72a243b

Co-Authored-By: Chris Jones <[email protected]>

cmsbuild removed the code-checks-approved label Aug 5, 2019

cmsbuild added reconstruction-approved and removed reconstruction-pending labels Aug 27, 2019

cmsbuild added hlt-approved and removed hlt-pending labels Aug 28, 2019

cmsbuild added dqm-approved fully-signed and removed dqm-pending pending-signatures labels Aug 28, 2019

cmsbuild added orp-approved and removed orp-pending labels Aug 28, 2019

cmsbuild merged commit 138dd8b into cms-sw:master Aug 28, 2019

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Sep 12, 2019

Update PixelCPEFast_cfi.py following cms-sw#27694

67128cf

makortel pushed a commit to makortel/cmssw that referenced this pull request Sep 13, 2019

Update PixelCPEFast_cfi.py following cms-sw#27694

513c861

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 8, 2020

Update PixelCPEFast_cfi.py following cms-sw#27694

7112113

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 19, 2020

Update PixelCPEFast_cfi.py following cms-sw#27694

78109ca

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 20, 2020

Update PixelCPEFast_cfi.py following cms-sw#27694

02aa8a1

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Oct 23, 2020

Update PixelCPEFast_cfi.py following cms-sw#27694

586518f

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Nov 6, 2020

Update PixelCPEFast_cfi.py following cms-sw#27694

b8e83b8

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Nov 16, 2020

Update PixelCPEFast_cfi.py following cms-sw#27694

2e09e5e

fwyzard added a commit to cms-patatrack/cmssw that referenced this pull request Nov 27, 2020

Update PixelCPEFast_cfi.py following cms-sw#27694

bc0c1b3

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Provide fillDescriptions for Pixel CPE classes #27694

Provide fillDescriptions for Pixel CPE classes #27694

mmusich commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

Dr15Jones commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

slava77 commented Aug 27, 2019

slava77 commented Aug 27, 2019

Martin-Grunewald commented Aug 28, 2019

jfernan2 commented Aug 28, 2019

cmsbuild commented Aug 28, 2019

kpedro88 commented Aug 28, 2019

fwyzard commented Sep 12, 2019

makortel commented Sep 12, 2019

mmusich commented Sep 12, 2019 •

edited

Loading

fwyzard commented Sep 12, 2019

Provide fillDescriptions for Pixel CPE classes #27694

Provide fillDescriptions for Pixel CPE classes #27694

Conversation

mmusich commented Aug 5, 2019

PR description:

PR validation:

if this PR is a backport please specify the original PR:

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

Dr15Jones commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

cmsbuild commented Aug 5, 2019

slava77 commented Aug 27, 2019

slava77 commented Aug 27, 2019

Martin-Grunewald commented Aug 28, 2019

jfernan2 commented Aug 28, 2019

cmsbuild commented Aug 28, 2019

kpedro88 commented Aug 28, 2019

fwyzard commented Sep 12, 2019

makortel commented Sep 12, 2019

mmusich commented Sep 12, 2019 • edited Loading

fwyzard commented Sep 12, 2019

mmusich commented Sep 12, 2019 •

edited

Loading